Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Movie Accurate M10s #173

Closed
wants to merge 30 commits into from
Closed

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Mar 22, 2024

Adds new M10 sprites for Riflemen, SGTs, and Corpsmen that is more accurate to the movies. Old sprites are still there, now just no longer used.

Also adds integrated headset component to allow for attaching headsets to headgear. Shown: https://www.youtube.com/watch?v=V34R6HBdFb0

@FslashN
Copy link
Contributor

FslashN commented Mar 27, 2024

Can you post a screenshot? I don't think I've seen what these look like.

@Max-023
Copy link
Contributor Author

Max-023 commented Mar 28, 2024

image
This is what the helmet looks like, shown with the rest of the gear. Additional strapping is layered over the helmet, as well as the camera and radio now being part of the sprite in visual form. I've also adjusted corpsman and platoon sergeant helmets to have the same additions, though the corpsman helmet lacks the additional strapping.

It is notable that not all helmet accessories have yet been adjusted as to not look out of place with the altered helmet, but should this work be to your liking I can certainly fix that.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@FslashN
Copy link
Contributor

FslashN commented Mar 29, 2024

I like the change. Looks neato. If you would like to adjust accessories so they look right with the cam, go for it. It's on auto-merge, when you fix the icon conflict.

@FslashN FslashN enabled auto-merge (squash) March 29, 2024 16:39
@Max-023
Copy link
Contributor Author

Max-023 commented Mar 30, 2024

Aight, will do!

auto-merge was automatically disabled March 30, 2024 03:48

Head branch was pushed to by a user without write access

Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@grifp71
Copy link
Contributor

grifp71 commented Mar 30, 2024

looks like this is still reverting amory's sprite changes to other headgear like the boonie according to iconbot

@Max-023
Copy link
Contributor Author

Max-023 commented Mar 30, 2024

I wasn't aware he made changes to the softcap headgear so when I get back home I'll match sure to patch those in.

@Max-023
Copy link
Contributor Author

Max-023 commented Mar 30, 2024

Alright, that should fix this PR.

@AmoryBlaine
Copy link
Contributor

Alright, that should fix this PR.

You're still overriding the new PO helmet, and desert cap and its flipped state with the old shading. I will also say, I'm not sure why you're integrating a mic into the helmet when we have a earpiece system. Adding a mic piece communicates something that doesn't exist. The helmets do have camera functionality, they don't have earpiece functionality.

@Max-023
Copy link
Contributor Author

Max-023 commented Mar 31, 2024

Added the PO helmet and new desert patrol cap. The changes are there to provide an aesthetic change to match that of the movie this project is based on. While yes, the helmet doesn't have a built in radio function code wise, that could be changed in the future.

@FslashN
Copy link
Contributor

FslashN commented Mar 31, 2024

Hmmm... Okay, we will TM this and see what that does. I'm fine with the helmet ear pieces, and in fact may be something we will do in the future. But if it's out of place, we probably want to remove that before merging it in proper.

@morrowwolf
Copy link
Member

Cooking

@morrowwolf morrowwolf marked this pull request as ready for review April 6, 2024 01:06
Copy link

github-actions bot commented Apr 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

github-actions bot commented Apr 6, 2024

Conflicts have been resolved. A maintainer will review the pull request shortly.

harryob
harryob previously approved these changes Apr 6, 2024
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still a todo, i know. just for the code currently

@AmoryBlaine
Copy link
Contributor

Played three rounds with it. Not really a fan. Visible camera is good, but I don't like how the headset bit is integrated. It's palette is very bland, and it does look like a helmet strap. Obviously I'm biased because I have my own sprites but I also just don't think it's that great to have it integrated with the helmet when you can just have visible headsets beneath to achieve the same outcome with much more versatility.

@XSlayer300
Copy link
Contributor

I'd prefer if the headsets are around as surplus uniform vendors if anyone doesn't want to wear a helmet or those who never have a helmet in the first place.

@morrowwolf
Copy link
Member

Gotta figure out how I want to handle some of the icons with multiple suffixes. So SoonTM.

@morrowwolf morrowwolf marked this pull request as draft April 10, 2024 01:40
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@AndroBetel
Copy link
Contributor

stale for more than a month, author seems to be inactive

@AndroBetel AndroBetel closed this Jun 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants